Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship>
Tue, 13 Apr 2010 12:24:53 +0000 (12:24 +0000)
committerKatsumi Yamaoka <katsumi@flagship>
Tue, 13 Apr 2010 12:24:53 +0000 (12:24 +0000)

Trivial merge